colorplane: Update to new GtkGestureSingle/GtkEventController defaults
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 11 Aug 2014 19:45:51 +0000 (21:45 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 15 Aug 2014 11:49:39 +0000 (13:49 +0200)
GtkGestureSingle::button is set to 0, as multiple buttons are managed by
the same gesture. Also avoid some extra lines of code setting what nowadays
are default values.

https://bugzilla.gnome.org/show_bug.cgi?id=734285

gtk/gtkcolorplane.c

index 7adb4c94d2803027971914c42ef364212652c217..a50e920f72a9ba0a98efde7a32fecc3008a08694 100644 (file)
@@ -410,16 +410,13 @@ gtk_color_plane_init (GtkColorPlane *plane)
                    G_CALLBACK (plane_drag_gesture_update), plane);
   g_signal_connect (plane->priv->drag_gesture, "drag-end",
                    G_CALLBACK (plane_drag_gesture_end), plane);
-  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (plane->priv->drag_gesture),
-                                              GTK_PHASE_BUBBLE);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->priv->drag_gesture),
-                                     FALSE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (plane->priv->drag_gesture), 0);
 
   plane->priv->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (plane));
   g_signal_connect (plane->priv->long_press_gesture, "pressed",
                     G_CALLBACK (hold_action), plane);
-  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (plane->priv->long_press_gesture),
-                                              GTK_PHASE_BUBBLE);
+  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->priv->drag_gesture),
+                                     TRUE);
 }
 
 static void